Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Support all options to create orchestration stacks #88

Merged
merged 1 commit into from
Dec 12, 2016
Merged

Support all options to create orchestration stacks #88

merged 1 commit into from
Dec 12, 2016
+145 −4

Conversation

bzwei
Copy link
Contributor

@bzwei bzwei commented Nov 28, 2016

Before when creating a Cloudformation stack we only accept two optional options, timeout and on_failure. Feature request https://bugzilla.redhat.com/show_bug.cgi?id=1385712 wants to set the capacities option.

This work now enables manageiq users to supply any option that Cloudformation supports. The conversion is based on the assumption that the options are input through manageiq service dialog. Most of the inputs are through textfields:

  • timeout
  • role_arn
  • policy: the code interprets whether it is an url or policy body
  • resource types: comma separated string; converted to an array
  • notification arns: comma separated string; converted to an array
  • tags: string in the format of tagKey1 => tagVal1, tagKey2 => tagVal2; converted to an array of hashes

Others are from dropdown lists:

  • on failure: single selection
  • capabilities: multiple selection

A follow-up PR will enhance out service dialog creation tool to use textfields and drop downs to receive above user options, while this change is backward compatible with the existing service dialog that takes only timeout and on_failure options.

https://bugzilla.redhat.com/show_bug.cgi?id=1385712
https://www.pivotaltracker.com/story/show/133693457
http://docs.aws.amazon.com/sdkforruby/api/Aws/CloudFormation/Client.html#create_stack-instance_method

@bzwei bzwei force-pushed the orchestration_more_options branch from 2a4ae0f to 50a2938 Compare November 28, 2016 22:55
@bzwei
Copy link
Contributor Author

bzwei commented Nov 28, 2016

@durandom @gmcculloug please review

durandom
durandom reviewed Nov 30, 2016
View reviewed changes
Copy link
Member

@durandom durandom left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

overall LGTM

app/models/manageiq/providers/amazon/cloud_manager/orchestration_service_option_converter.rb
timeout = @dialog_options['dialog_stack_timeout']
stack_options = {:parameters => stack_parameters, :disable_rollback => on_failure != 'ROLLBACK'}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

what about :disable_rollback is that superseded by another key?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes. We now use :on_failure so :disable_rollback should not be used.

@durandom
Copy link
Member

durandom commented Dec 1, 2016

@gmcculloug can you have a second look too?
I'll merge upon your 👍

@durandom durandom self-assigned this Dec 1, 2016
@bzwei
Copy link
Contributor Author

bzwei commented Dec 2, 2016

Because of our service dialog TextBox's length constraint, we cannot use comma separated string to receive an array. I will change them to TextAreaBox. Will update this PR.

@bzwei bzwei force-pushed the orchestration_more_options branch from 50a2938 to b8fdf05 Compare December 2, 2016 18:07
@bzwei
Support all options to create orchestration stacks
421d170 
Now accept all options that Cloudformation recognizes while creating a stack

https://bugzilla.redhat.com/show_bug.cgi?id=1385712
@bzwei bzwei force-pushed the orchestration_more_options branch from b8fdf05 to 421d170 Compare December 2, 2016 22:47
@bzwei bzwei mentioned this pull request Dec 6, 2016
Closed
@bzwei
Copy link
Contributor Author

bzwei commented Dec 8, 2016

@gmcculloug @durandom Updated the PR. We expect to take array inputs from text area, one entry per line.

@durandom
Copy link
Member

durandom commented Dec 8, 2016

@gmcculloug can you have a look, I'll merge upon your 👍

@gmcculloug
Copy link
Member

@bzwei Can you add a screenshot of a service dialog showing examples for the new options?

@gmcculloug
Copy link
Member

I was hoping for some text in the dialog fields to show

examples for the new options

@bzwei
Copy link
Contributor Author

bzwei commented Dec 9, 2016

awsstack2

@gmcculloug
Copy link
Member

Much better, thanks! @durandom 👍

@durandom
Copy link
Member

cool, thanks for the screenshots @bzwei

@durandom durandom merged commit 07feb3e into ManageIQ:master Dec 12, 2016
@durandom durandom mentioned this pull request Dec 12, 2016
Merged
@bzwei bzwei deleted the orchestration_more_options branch December 12, 2016 20:45
@bzwei
Copy link
Contributor Author

bzwei commented Jan 16, 2017

This bug has been cloned to cfme-5.7.z bug #1411369
@miq-bot add_label euwe/yes

This bug has been cloned to cfme-5.6.z bug #1412447
@miq-bot add_label darga/yes

@simaishi simaishi removed the euwe/no label Jan 16, 2017
@simaishi
Copy link
Contributor

Darga backport (to manageiq repo) details:

$ git log -1
commit 74ed59c4d20562ec1922e9bc2e377340c96ebcc4
Author: Marcel Hild <[email protected]>
Date:   Mon Dec 12 10:50:35 2016 +0100

    Merge pull request #88 from bzwei/orchestration_more_options
    
    Support all options to create orchestration stacks
    (cherry picked from commit 07feb3e1d847163da49491c276731f51c045bfc8)
    
    https://bugzilla.redhat.com/show_bug.cgi?id=1412447

@bzwei bzwei mentioned this pull request Jan 16, 2017
Merged
simaishi pushed a commit that referenced this pull request Jan 17, 2017
@durandom @simaishi
Merge pull request #88 from bzwei/orchestration_more_options
f8754e6 
Support all options to create orchestration stacks
(cherry picked from commit 07feb3e)

https://bugzilla.redhat.com/show_bug.cgi?id=1411369
@simaishi
Copy link
Contributor

Euwe backport details:

$ git log -1
commit f8754e69b0a1e26a683fd5c7cdb078925a6f2568
Author: Marcel Hild <[email protected]>
Date:   Mon Dec 12 10:50:35 2016 +0100

    Merge pull request #88 from bzwei/orchestration_more_options
    
    Support all options to create orchestration stacks
    (cherry picked from commit 07feb3e1d847163da49491c276731f51c045bfc8)
    
    https://bugzilla.redhat.com/show_bug.cgi?id=1411369

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@durandom durandom durandom left review comments

Assignees

@durandom durandom

Labels
darga/backported enhancement euwe/backported
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@bzwei @durandom @gmcculloug @simaishi @miq-bot